3390cbb3c7d2ffe77a96488c91052ff6593e5069,src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java,DownloadTask,addOrMergeLayer,#L#L#,145

Before Change


        private <L extends Layer> L addOrMergeLayer(L layer, L mergeLayer) {
            if (layer == null) return null;
            if (newLayer || mergeLayer == null) {
                Main.main.addLayer(layer);
                return layer;
            } else {
                mergeLayer.mergeFrom(layer);

After Change


        private <L extends Layer> L addOrMergeLayer(L layer, L mergeLayer) {
            if (layer == null) return null;
            if (newLayer || mergeLayer == null) {
                if (Main.main != null) {
                    Main.main.addLayer(layer);
                }
                return layer;
            } else {